Merge pull request #1486 from International/agents_n_plus_one
Agent n+1 query fixes
Dominik Sander
2 changed files with 3 additions and 3 deletions
+ 1
- 1
app/views/agents/_action_menu.html.erb
@@ -47,7 +47,7 @@ |
||
| 47 | 47 |
|
| 48 | 48 |
<li class="divider"></li> |
| 49 | 49 |
|
| 50 |
- <% if agent.can_create_events? && agent.events.count > 0 %> |
|
| 50 |
+ <% if agent.can_create_events? && agent.events_count > 0 %> |
|
| 51 | 51 |
<li> |
| 52 | 52 |
<%= link_to icon_tag('glyphicon-trash', class: 'color-danger') + ' Delete all events', remove_events_agent_path(agent, return: return_to), method: :delete, data: {confirm: 'Are you sure you want to delete ALL emitted events for this Agent?'}, tabindex: "-1" %>
|
| 53 | 53 |
</li> |
+ 2
- 2
app/views/agents/show.html.erb
@@ -14,7 +14,7 @@ |
||
| 14 | 14 |
|
| 15 | 15 |
<li><a href="#logs" data-toggle="tab" data-agent-id="<%= @agent.id %>" class='<%= @agent.recent_error_logs? ? 'recent-errors' : '' %>'><span class='glyphicon glyphicon-list-alt'></span> Logs</a></li> |
| 16 | 16 |
|
| 17 |
- <% if @agent.can_create_events? && @agent.events.count > 0 %> |
|
| 17 |
+ <% if @agent.can_create_events? && @agent.events_count > 0 %> |
|
| 18 | 18 |
<li><%= link_to icon_tag('glyphicon-random') + ' Events'.html_safe, agent_events_path(@agent, return: request.fullpath) %></li>
|
| 19 | 19 |
<% else %> |
| 20 | 20 |
<li class='disabled'><a><span class='glyphicon glyphicon-random'></span> Events</a></li> |
@@ -103,7 +103,7 @@ |
||
| 103 | 103 |
<% if @agent.can_create_events? %> |
| 104 | 104 |
<p> |
| 105 | 105 |
<b>Events created:</b> |
| 106 |
- <%= link_to @agent.events.count, agent_events_path(@agent) %> |
|
| 106 |
+ <%= link_to @agent.events_count, agent_events_path(@agent) %> |
|
| 107 | 107 |
</p> |
| 108 | 108 |
<% end %> |
| 109 | 109 |
|